merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
Simple merge

diff --cc xen/arch/ia64/vmx/mmio.c
Simple merge

diff --cc xen/arch/ia64/vmx/vmx_init.c
index e7e7770145ab46b6375dd77ec9aa2dc6356f0546,30661e7591fc0ee3072084c10d6ac17db222aeb3..885e62f68cfe07652d81900c9cf3a91affb49af4
--- 1/xen/arch/ia64/vmx/vmx_init.c
--- 2/xen/arch/ia64/vmx/vmx_init.c
+++ b/xen/arch/ia64/vmx/vmx_init.c
@@@ -371,13 -373,9 +369,9 @@@ int vmx_alloc_contig_pages(struct domai
  
  void vmx_setup_platform(struct domain *d, struct vcpu_guest_context *c)
  {
-       shared_iopage_t *sp;
- 
        ASSERT(d != dom0); /* only for non-privileged vti domain */
        d->arch.vmx_platform.shared_page_va =
 -              __va(__gpa_to_mpa(d, IO_PAGE_START));
 +              (unsigned long)__va(__gpa_to_mpa(d, IO_PAGE_START));
-       sp = get_sp(d);
-       //memset((char *)sp,0,PAGE_SIZE);
        /* TEMP */
        d->arch.vmx_platform.pib_base = 0xfee00000UL;
  

diff --cc xen/arch/ia64/xen/process.c
Simple merge

diff --cc xen/arch/ia64/xen/xenmisc.c
Simple merge

diff --cc xen/include/asm-ia64/vmx.h
Simple merge